projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
981ed8d
)
(ediff-version): Declare as a function.
author
Glenn Morris
<rgm@gnu.org>
Wed, 5 Dec 2007 03:33:30 +0000
(
03:33
+0000)
committer
Glenn Morris
<rgm@gnu.org>
Wed, 5 Dec 2007 03:33:30 +0000
(
03:33
+0000)
lisp/ediff-util.el
patch
|
blob
|
history
diff --git
a/lisp/ediff-util.el
b/lisp/ediff-util.el
index f3e5a250f9e6fb6bba79619600658086e50292d0..a642167474cf0e88b174c2be8dae0e83d9d456c9 100644
(file)
--- a/
lisp/ediff-util.el
+++ b/
lisp/ediff-util.el
@@
-2817,6
+2817,9
@@
up an appropriate window config."
"To resume, type M-x eregistry and select the desired Ediff session"))
+;; ediff-barf-if-not-control-buffer ensures only called from ediff.
+(declare-function ediff-version "ediff" ())
+
(defun ediff-status-info ()
"Show the names of the buffers or files being operated on by Ediff.
Hit \\[ediff-recenter] to reset the windows afterward."